meson: Support graphene as a fallback dependency
authorNirbheek Chauhan <nirbheek@centricular.com>
Fri, 6 Jul 2018 18:53:06 +0000 (00:23 +0530)
committerNirbheek Chauhan <nirbheek@centricular.com>
Mon, 23 Jul 2018 14:47:04 +0000 (20:17 +0530)
Don't assume graphene_dep is always a pkg-config dependency.

Closes https://gitlab.gnome.org/GNOME/gtk/issues/1197

meson.build

index ede2e155a7b8b46ebae7c6db87878adf0a26f5bd..713877808fcd3c91207a668d667b322ed87e8cef 100644 (file)
@@ -640,8 +640,15 @@ if cloudproviders_enabled
   endif
 endif
 
-graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1'
-graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1'
+graphene_dep_type = graphene_dep.type_name()
+if graphene_dep_type == 'pkgconfig'
+  graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1'
+  graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1'
+else
+  graphene_simd = subproject('graphene').get_variable('graphene_simd')
+  graphene_has_sse2 = graphene_simd.contains('sse2')
+  graphene_has_gcc = graphene_simd.contains('gcc')
+endif
 
 malloc_is_aligned = false